quartz: fix build on 10.6 and below
authorMarcus Karlsson <mk@acc.umu.se>
Sun, 26 Oct 2014 11:26:48 +0000 (12:26 +0100)
committerMatthias Clasen <mclasen@redhat.com>
Mon, 27 Oct 2014 10:46:12 +0000 (06:46 -0400)
It is not possible to successfully build GTK+ on OS X 10.6 and below
since NSFullScreenWindowMask is only available starting with 10.7. Add
ifdef guards around setStyleMask: in order to allow it to build on
earlier OS X releases.

https://bugzilla.gnome.org/show_bug.cgi?id=737561

gdk/quartz/GdkQuartzNSWindow.c
gdk/quartz/GdkQuartzNSWindow.h

index 6bc05a4c4db0e8e69bd117a0485b6878317ecf4f..43348ef0f76b98a1cf3cddb09b658b338aa64ef1 100644 (file)
@@ -654,6 +654,8 @@ update_context_from_dragging_info (id <NSDraggingInfo> sender)
   _gdk_quartz_drag_source_context = NULL;
 }
 
+#ifdef AVAILABLE_MAC_OS_X_VERSION_10_7_AND_LATER
+
 - (void)setStyleMask:(NSUInteger)styleMask
 {
   gboolean was_fullscreen;
@@ -669,4 +671,6 @@ update_context_from_dragging_info (id <NSDraggingInfo> sender)
     _gdk_quartz_window_update_fullscreen_state ([[self contentView] gdkWindow]);
 }
 
+#endif
+
 @end
index 80b910cffcf52b2963f4e75dc492a26b79dda666..540b965afb7951acd95dc24a57021c1907d09aa3 100644 (file)
 -(BOOL)trackManualResize;
 -(void)showAndMakeKey:(BOOL)makeKey;
 -(void)hide;
+
+#ifdef AVAILABLE_MAC_OS_X_VERSION_10_7_AND_LATER
 -(void)setStyleMask:(NSUInteger)styleMask;
+#endif
 
 @end